From d9e6a2856c7dd32456179d72e1b4f47e2e6dc6a5 Mon Sep 17 00:00:00 2001 From: Hollis Blanchard Date: Wed, 3 Jan 2007 17:11:55 -0600 Subject: [PATCH] [POWERPC][TOOLS] Fix xc.c mismerge. Signed-off-by: Hollis Blanchard --- tools/python/xen/lowlevel/xc/xc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index eaa8fe0846..6f3e643a6a 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -930,7 +930,7 @@ static PyObject *pyxc_alloc_real_mode_area(XcObject *self, return NULL; if ( xc_alloc_real_mode_area(self->xc_handle, dom, log) ) - return PyErr_SetFromErrno(xc_error); + return pyxc_error_to_exception(); Py_INCREF(zero); return zero; @@ -944,6 +944,7 @@ static PyObject *pyxc_prose_build(XcObject *self, char *image, *ramdisk = NULL, *cmdline = "", *features = NULL; int flags = 0; int store_evtchn, console_evtchn; + unsigned int mem_mb; unsigned long store_mfn = 0; unsigned long console_mfn = 0; void *arch_args = NULL; @@ -955,22 +956,22 @@ static PyObject *pyxc_prose_build(XcObject *self, "ramdisk", "cmdline", "flags", "features", "arch_args", NULL }; - if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiis|ssiss#", kwd_list, - &dom, &store_evtchn, + if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiis|ssiss#", kwd_list, + &dom, &store_evtchn, &mem_mb, &console_evtchn, &image, /* optional */ &ramdisk, &cmdline, &flags, &features, &arch_args, &unused) ) return NULL; - if ( xc_prose_build(self->xc_handle, dom, image, + if ( xc_prose_build(self->xc_handle, dom, mem_mb, image, ramdisk, cmdline, features, flags, store_evtchn, &store_mfn, console_evtchn, &console_mfn, arch_args) != 0 ) { if (!errno) errno = EINVAL; - return PyErr_SetFromErrno(xc_error); + return pyxc_error_to_exception(); } return Py_BuildValue("{s:i,s:i}", "store_mfn", store_mfn, -- 2.30.2